diff --git a/system/application/config/autoload.php b/system/application/config/autoload.php
index 1ed6f17..4efe3be 100644
--- a/system/application/config/autoload.php
+++ b/system/application/config/autoload.php
@@ -10,8 +10,7 @@
 | the database is not connected to automatically since no assumption
 | is made regarding whether you intend to use it.  This file lets
 | you globally define which systems you would like loaded with every
-| request. In addition to core systems you can auto-load plugins,
-| helper files, config files, and your own scripts.
+| request.
 |
 | -------------------------------------------------------------------
 | Instructions
@@ -19,27 +18,27 @@
 |
 | These are the things you can load automatically:
 |
-| 1. Core classes
+| 1. Libraries
 | 2. Helper files
 | 3. Plugins
 | 4. Scripts
 | 5. Custom config files
 |
-| Note: The items will be loaded in the order that they are defined
-|
-| Please read the user guide for more detailed information
 */
 
 /*
 | -------------------------------------------------------------------
-|  Auto-load Core Classes
+|  Auto-load Libraries
 | -------------------------------------------------------------------
+| These are the classes located in the system/libraries folder
+| or in your system/application/libraries folder.
+|
 | Prototype:
 |
-|	$autoload['core'] = array('database', 'session', 'xmlrpc');
+|	$autoload['libraries'] = array('database', 'session', 'xmlrpc');
 */
 
-$autoload['core'] = array();
+$autoload['libraries'] = array();
 
 
 /*
@@ -97,5 +96,15 @@
 $autoload['config'] = array();
 
 
+/*
+| -------------------------------------------------------------------
+|  Auto-load Core Libraries
+| -------------------------------------------------------------------
+|
+| DEPRECATED:  Use $autoload $autoload['libraries'] instead.
+|
+*/
+// $autoload['core'] = array();
+
 
 ?>
\ No newline at end of file
diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index 768b154..5a32e65 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -232,16 +232,20 @@
 		}
 		unset($autoload['config']);
 		
-		if ( ! is_array($autoload['core']))
+		// A little tweak to remain backward compatible
+		// The $autoload['core'] item was deprecated
+		if ( ! isset($autoload['libraries']))
 		{
-			$autoload['core'] = array($autoload['core']);
+			$autoload['libraries'] = $autoload['core'];
+		
 		}
 		
-		foreach ($autoload['core'] as $item)
+		foreach ($autoload['libraries'] as $item)
 		{
 			$this->_ci_initialize($item);
 		}
-		
+		unset($autoload['libraries']);
+
 		return $autoload;
 	}
   	// END _ci_autoload()
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index 80ffe7a..9aa9dcf 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -79,6 +79,9 @@
 <li>Fixed a bug that was causing a PHP error when the Exceptions class was called within the _get_config() function.</li>
 <li>Fixed an oversight in the cookie helper in which the config file cookie settings were not being honored.</li>
 <li>Added some code to allow email attachments to be reset when sending batches of email.</li>
+<li>Deprecated the <dfn>application/scripts</dfn> folder. It will continue to work for legacy users, but it is recommended that you create your own
+<a href="../general/libraries.html">libraries</a> or <a href="../general/models.html">models</a> instead.
+<li>Deprecated the <dfn>$autoload['core']</dfn> item from the <kbd>autoload.php</kbd> file.  Instead, please now use: <kbd>$autoload['libraries']</kbd></li>
 <li>Deprecated the following database functions: $this->db->smart_escape_str() and $this->db->fields().</li>
 </ul>
 
diff --git a/user_guide/scripts/nav.js b/user_guide/scripts/nav.js
index de5a35f..960a6a8 100644
--- a/user_guide/scripts/nav.js
+++ b/user_guide/scripts/nav.js
@@ -43,7 +43,6 @@
 			'<li><a href="'+base+'general/models.html">Models</a></li>' +
 			'<li><a href="'+base+'general/helpers.html">Helpers</a></li>' +
 			'<li><a href="'+base+'general/plugins.html">Plugins</a></li>' +
-			'<li><a href="'+base+'general/scripts.html">Scripts</a></li>' +
 			'<li><a href="'+base+'general/libraries.html">Using Code Igniter Libraries</a></li>' +
 			'<li><a href="'+base+'general/creating_libraries.html">Creating Your Own Libraries</a></li>' +
 			'<li><a href="'+base+'general/core_classes.html">Creating Core Classes</a></li>' +